Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 23:38:14 +0000 (16:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 23:38:14 +0000 (16:38 -0700)

Trivial merge